From e0e34e59eacae0cdb9f78a93c1c4bb2c77f0993b Mon Sep 17 00:00:00 2001 From: Chema Celorio Date: Sun, 26 Aug 2001 04:01:27 +0000 Subject: [PATCH] pass ->nrows to gtk_table_resize as the first argument for 2001-08-25 Chema Celorio * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktable.c | 4 ++-- 8 files changed, 51 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1945f18a14..fdab7bcfce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-08-25 Chema Celorio + + * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to + gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH + and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols + 2001-08-24 Havoc Pennington * gtk/gtkcompat.h: remove gtk_menu_* compat defines; @@ -424,6 +430,7 @@ Sun Aug 12 10:39:12 2001 Owen Taylor * Makefile.am (EXTRA_DIST): Fix problem with trying to dist files from intl/, which is no longer there. +>>>>>>> 1.2213 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1945f18a14..fdab7bcfce 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-08-25 Chema Celorio + + * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to + gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH + and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols + 2001-08-24 Havoc Pennington * gtk/gtkcompat.h: remove gtk_menu_* compat defines; @@ -424,6 +430,7 @@ Sun Aug 12 10:39:12 2001 Owen Taylor * Makefile.am (EXTRA_DIST): Fix problem with trying to dist files from intl/, which is no longer there. +>>>>>>> 1.2213 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1945f18a14..fdab7bcfce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-08-25 Chema Celorio + + * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to + gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH + and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols + 2001-08-24 Havoc Pennington * gtk/gtkcompat.h: remove gtk_menu_* compat defines; @@ -424,6 +430,7 @@ Sun Aug 12 10:39:12 2001 Owen Taylor * Makefile.am (EXTRA_DIST): Fix problem with trying to dist files from intl/, which is no longer there. +>>>>>>> 1.2213 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1945f18a14..fdab7bcfce 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-08-25 Chema Celorio + + * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to + gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH + and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols + 2001-08-24 Havoc Pennington * gtk/gtkcompat.h: remove gtk_menu_* compat defines; @@ -424,6 +430,7 @@ Sun Aug 12 10:39:12 2001 Owen Taylor * Makefile.am (EXTRA_DIST): Fix problem with trying to dist files from intl/, which is no longer there. +>>>>>>> 1.2213 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1945f18a14..fdab7bcfce 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-08-25 Chema Celorio + + * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to + gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH + and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols + 2001-08-24 Havoc Pennington * gtk/gtkcompat.h: remove gtk_menu_* compat defines; @@ -424,6 +430,7 @@ Sun Aug 12 10:39:12 2001 Owen Taylor * Makefile.am (EXTRA_DIST): Fix problem with trying to dist files from intl/, which is no longer there. +>>>>>>> 1.2213 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1945f18a14..fdab7bcfce 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-08-25 Chema Celorio + + * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to + gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH + and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols + 2001-08-24 Havoc Pennington * gtk/gtkcompat.h: remove gtk_menu_* compat defines; @@ -424,6 +430,7 @@ Sun Aug 12 10:39:12 2001 Owen Taylor * Makefile.am (EXTRA_DIST): Fix problem with trying to dist files from intl/, which is no longer there. +>>>>>>> 1.2213 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1945f18a14..fdab7bcfce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-08-25 Chema Celorio + + * gtk/gtktable.c (gtk_table_set_child_property): pass ->nrows to + gtk_table_resize as the first argument for CHILD_PROP_RIGHT_ATTACH + and CHILD_PROP_LEFT_ATTACH v.s. using ->ncols + 2001-08-24 Havoc Pennington * gtk/gtkcompat.h: remove gtk_menu_* compat defines; @@ -424,6 +430,7 @@ Sun Aug 12 10:39:12 2001 Owen Taylor * Makefile.am (EXTRA_DIST): Fix problem with trying to dist files from intl/, which is no longer there. +>>>>>>> 1.2213 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, diff --git a/gtk/gtktable.c b/gtk/gtktable.c index e85f122d4a..f1696a7fa6 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -340,14 +340,14 @@ gtk_table_set_child_property (GtkContainer *container, if (table_child->right_attach <= table_child->left_attach) table_child->right_attach = table_child->left_attach + 1; if (table_child->right_attach >= table->ncols) - gtk_table_resize (table, table->ncols, table_child->right_attach); + gtk_table_resize (table, table->nrows, table_child->right_attach); break; case CHILD_PROP_RIGHT_ATTACH: table_child->right_attach = g_value_get_uint (value); if (table_child->right_attach <= table_child->left_attach) table_child->left_attach = table_child->right_attach - 1; if (table_child->right_attach >= table->ncols) - gtk_table_resize (table, table->ncols, table_child->right_attach); + gtk_table_resize (table, table->nrows, table_child->right_attach); break; case CHILD_PROP_TOP_ATTACH: table_child->top_attach = g_value_get_uint (value); -- 2.30.2